From 2e0a56665a85421e6be947274b2d513ac142993c Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 10 Apr 2019 18:40:50 +0200 Subject: [PATCH] css: Move gtkcsssection.[ch] into gtk/css --- gtk/css/gtkcss.h | 1 + gtk/{ => css}/gtkcsssection.c | 21 ++++++++++----------- gtk/{ => css}/gtkcsssection.h | 7 ++++++- gtk/css/meson.build | 2 ++ gtk/gtk.h | 1 - gtk/gtkcsslookupprivate.h | 4 +++- gtk/gtkcssprovider.c | 13 ++++++------- gtk/gtkcssprovider.h | 2 +- gtk/gtkcssstyle.c | 1 - gtk/gtkcssstyleprivate.h | 2 +- gtk/gtkstylecontext.h | 3 ++- gtk/inspector/css-node-tree.c | 5 +++-- gtk/meson.build | 2 -- 13 files changed, 35 insertions(+), 29 deletions(-) rename gtk/{ => css}/gtkcsssection.c (91%) rename gtk/{ => css}/gtkcsssection.h (92%) diff --git a/gtk/css/gtkcss.h b/gtk/css/gtkcss.h index 343244c2c3..fbbc8d42a8 100644 --- a/gtk/css/gtkcss.h +++ b/gtk/css/gtkcss.h @@ -34,6 +34,7 @@ #include #include #include +#include #undef __GTK_CSS_H_INSIDE__ diff --git a/gtk/gtkcsssection.c b/gtk/css/gtkcsssection.c similarity index 91% rename from gtk/gtkcsssection.c rename to gtk/css/gtkcsssection.c index 3134666796..f3981603f8 100644 --- a/gtk/gtkcsssection.c +++ b/gtk/css/gtkcsssection.c @@ -20,7 +20,6 @@ #include "gtkcsssection.h" #include "gtkcssparserprivate.h" -#include "gtkprivate.h" struct _GtkCssSection { @@ -52,9 +51,9 @@ gtk_css_section_new (GFile *file, { GtkCssSection *result; - gtk_internal_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL); - gtk_internal_return_val_if_fail (start != NULL, NULL); - gtk_internal_return_val_if_fail (end != NULL, NULL); + g_return_val_if_fail (file == NULL || G_IS_FILE (file), NULL); + g_return_val_if_fail (start != NULL, NULL); + g_return_val_if_fail (end != NULL, NULL); result = g_slice_new0 (GtkCssSection); @@ -78,7 +77,7 @@ gtk_css_section_new (GFile *file, GtkCssSection * gtk_css_section_ref (GtkCssSection *section) { - gtk_internal_return_val_if_fail (section != NULL, NULL); + g_return_val_if_fail (section != NULL, NULL); section->ref_count += 1; @@ -95,7 +94,7 @@ gtk_css_section_ref (GtkCssSection *section) void gtk_css_section_unref (GtkCssSection *section) { - gtk_internal_return_if_fail (section != NULL); + g_return_if_fail (section != NULL); section->ref_count -= 1; if (section->ref_count > 0) @@ -126,7 +125,7 @@ gtk_css_section_unref (GtkCssSection *section) GtkCssSection * gtk_css_section_get_parent (const GtkCssSection *section) { - gtk_internal_return_val_if_fail (section != NULL, NULL); + g_return_val_if_fail (section != NULL, NULL); return section->parent; } @@ -145,7 +144,7 @@ gtk_css_section_get_parent (const GtkCssSection *section) GFile * gtk_css_section_get_file (const GtkCssSection *section) { - gtk_internal_return_val_if_fail (section != NULL, NULL); + g_return_val_if_fail (section != NULL, NULL); return section->file; } @@ -162,7 +161,7 @@ gtk_css_section_get_file (const GtkCssSection *section) const GtkCssLocation * gtk_css_section_get_start_location (const GtkCssSection *section) { - gtk_internal_return_val_if_fail (section != NULL, NULL); + g_return_val_if_fail (section != NULL, NULL); return §ion->start_location; } @@ -179,7 +178,7 @@ gtk_css_section_get_start_location (const GtkCssSection *section) const GtkCssLocation * gtk_css_section_get_end_location (const GtkCssSection *section) { - gtk_internal_return_val_if_fail (section != NULL, NULL); + g_return_val_if_fail (section != NULL, NULL); return §ion->end_location; } @@ -245,7 +244,7 @@ gtk_css_section_to_string (const GtkCssSection *section) { GString *string; - gtk_internal_return_val_if_fail (section != NULL, NULL); + g_return_val_if_fail (section != NULL, NULL); string = g_string_new (NULL); gtk_css_section_print (section, string); diff --git a/gtk/gtkcsssection.h b/gtk/css/gtkcsssection.h similarity index 92% rename from gtk/gtkcsssection.h rename to gtk/css/gtkcsssection.h index fbca82105b..4367376152 100644 --- a/gtk/gtkcsssection.h +++ b/gtk/css/gtkcsssection.h @@ -18,8 +18,13 @@ #ifndef __GTK_CSS_SECTION_H__ #define __GTK_CSS_SECTION_H__ +#if !defined (__GTK_CSS_H_INSIDE__) && !defined (GTK_CSS_COMPILATION) +#error "Only can be included directly." +#endif + #include -#include +#include +#include G_BEGIN_DECLS diff --git a/gtk/css/meson.build b/gtk/css/meson.build index 18480ed88c..e97360f174 100644 --- a/gtk/css/meson.build +++ b/gtk/css/meson.build @@ -1,6 +1,7 @@ gtk_css_public_sources = files([ 'gtkcsslocation.c', 'gtkcsserror.c', + 'gtkcsssection.c', ]) gtk_css_private_sources = files([ @@ -12,6 +13,7 @@ gtk_css_public_headers = files([ 'gtkcssenums.h', 'gtkcsserror.h', 'gtkcsslocation.h', + 'gtkcsssection.h', ]) install_headers(gtk_css_public_headers, 'gtkcss.h', subdir: 'gtk-4.0/gtk/css') diff --git a/gtk/gtk.h b/gtk/gtk.h index 9358fcd517..477cf4e496 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -84,7 +84,6 @@ #include #include #include -#include #include #include #include diff --git a/gtk/gtkcsslookupprivate.h b/gtk/gtkcsslookupprivate.h index ca4094d940..5c8bbc96f1 100644 --- a/gtk/gtkcsslookupprivate.h +++ b/gtk/gtkcsslookupprivate.h @@ -19,9 +19,11 @@ #define __GTK_CSS_LOOKUP_PRIVATE_H__ #include + #include "gtk/gtkbitmaskprivate.h" #include "gtk/gtkcssstaticstyleprivate.h" -#include "gtk/gtkcsssection.h" + +#include "gtk/css/gtkcsssection.h" G_BEGIN_DECLS diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 59ce98701e..865a357952 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -17,12 +17,6 @@ #include "config.h" -#include -#include - -#include -#include - #include "gtkcssproviderprivate.h" #include "gtkbitmaskprivate.h" @@ -30,7 +24,6 @@ #include "gtkcsscolorvalueprivate.h" #include "gtkcsskeyframesprivate.h" #include "gtkcssparserprivate.h" -#include "gtkcsssection.h" #include "gtkcssselectorprivate.h" #include "gtkcssshorthandpropertyprivate.h" #include "gtksettingsprivate.h" @@ -45,6 +38,12 @@ #include "gtkintl.h" #include "gtkversion.h" +#include +#include + +#include +#include + /** * SECTION:gtkcssprovider * @Short_description: CSS-like styling for widgets diff --git a/gtk/gtkcssprovider.h b/gtk/gtkcssprovider.h index 4f6bac5cf1..9f05714173 100644 --- a/gtk/gtkcssprovider.h +++ b/gtk/gtkcssprovider.h @@ -19,7 +19,7 @@ #define __GTK_CSS_PROVIDER_H__ #include -#include +#include G_BEGIN_DECLS diff --git a/gtk/gtkcssstyle.c b/gtk/gtkcssstyle.c index 89f4a102a1..02fc1abc95 100644 --- a/gtk/gtkcssstyle.c +++ b/gtk/gtkcssstyle.c @@ -29,7 +29,6 @@ #include "gtkcssinitialvalueprivate.h" #include "gtkcssnumbervalueprivate.h" #include "gtkcssrgbavalueprivate.h" -#include "gtkcsssection.h" #include "gtkcssshorthandpropertyprivate.h" #include "gtkcssstringvalueprivate.h" #include "gtkcssfontfeaturesvalueprivate.h" diff --git a/gtk/gtkcssstyleprivate.h b/gtk/gtkcssstyleprivate.h index a17dc4203f..ae0947f169 100644 --- a/gtk/gtkcssstyleprivate.h +++ b/gtk/gtkcssstyleprivate.h @@ -21,9 +21,9 @@ #define __GTK_CSS_STYLE_PRIVATE_H__ #include +#include #include "gtk/gtkbitmaskprivate.h" -#include "gtk/gtkcsssection.h" #include "gtk/gtkcssvalueprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h index f489db9152..81b153f2b2 100644 --- a/gtk/gtkstylecontext.h +++ b/gtk/gtkstylecontext.h @@ -22,8 +22,9 @@ #error "Only can be included directly." #endif +#include + #include -#include #include #include diff --git a/gtk/inspector/css-node-tree.c b/gtk/inspector/css-node-tree.c index a6d6a202bc..d1983a2825 100644 --- a/gtk/inspector/css-node-tree.c +++ b/gtk/inspector/css-node-tree.c @@ -21,7 +21,6 @@ */ #include "config.h" -#include #include "css-node-tree.h" #include "prop-editor.h" @@ -33,7 +32,6 @@ #include "gtk/gtkwidgetprivate.h" #include "gtkcssproviderprivate.h" #include "gtkcssstylepropertyprivate.h" -#include "gtkcsssection.h" #include "gtkcssstyleprivate.h" #include "gtkcssvalueprivate.h" #include "gtkcssselectorprivate.h" @@ -45,6 +43,9 @@ #include "gtkmodelbutton.h" #include "gtkstack.h" +#include +#include + enum { COLUMN_NODE_NAME, COLUMN_NODE_VISIBLE, diff --git a/gtk/meson.build b/gtk/meson.build index 7ee01c2ff0..76fef838f5 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -201,7 +201,6 @@ gtk_public_sources = files([ 'gtkcomposetable.c', 'gtkcontainer.c', 'gtkcssprovider.c', - 'gtkcsssection.c', 'gtkdialog.c', 'gtkdnd.c', 'gtkdragdest.c', @@ -459,7 +458,6 @@ gtk_public_headers = files([ 'gtkcomboboxtext.h', 'gtkcontainer.h', 'gtkcssprovider.h', - 'gtkcsssection.h', 'gtkcustomlayout.h', 'gtkdebug.h', 'gtkdialog.h', -- 2.30.2